[MINIOS] fix x86_64 p2m map and CFLAGS

Signed-off-by: Tim Deegan <Tim.Deegan@xensource.com>

diff --git a/extras/mini-os/Makefile b/extras/mini-os/Makefile
index 75427676e50bca2615b46388cd6c0566c85031ba..26fe5ca8f69ae489b8dd9a1d95d1d8181243251b 100644 (file)
--- a/extras/mini-os/Makefile
+++ b/extras/mini-os/Makefile
@@ -123,3 +123,7 @@ cscope:
 tags:
        $(all_sources) | xargs ctags
 
+.PHONY: TAGS
+TAGS:
+       $(all_sources) | xargs etags
+

diff --git a/extras/mini-os/arch/x86/Makefile b/extras/mini-os/arch/x86/Makefile
index 10cb1ff9a16b838dd38948c20d50b48b5273f381..22cfe82811180fd5fe3a07f28a164cd84be2e84f 100644 (file)
--- a/extras/mini-os/arch/x86/Makefile
+++ b/extras/mini-os/arch/x86/Makefile
@@ -3,6 +3,9 @@
 # It's is used for x86_32, x86_32y and x86_64
 #
 
+XEN_ROOT = ../../../..
+include $(XEN_ROOT)/Config.mk
+
 # include arch.mk has to be before mini-os.mk!
 
 include arch.mk

diff --git a/extras/mini-os/arch/x86/mm.c b/extras/mini-os/arch/x86/mm.c
index 15ed4877a8af6573f1a1b2752e58b058fb67a8fd..8d4a8d42fba7fad95682b95b7e98130fd7593b67 100644 (file)
--- a/extras/mini-os/arch/x86/mm.c
+++ b/extras/mini-os/arch/x86/mm.c
@@ -405,9 +405,9 @@ void *map_frames(unsigned long *f, unsigned long n)
 
 void arch_init_p2m(unsigned long max_pfn)
 {
-#define L1_P2M_SHIFT    10
-#define L2_P2M_SHIFT    20    
-#define L3_P2M_SHIFT    30    
+#define L1_P2M_SHIFT    9
+#define L2_P2M_SHIFT    18    
+#define L3_P2M_SHIFT    27    
 #define L1_P2M_ENTRIES  (1 << L1_P2M_SHIFT)    
 #define L2_P2M_ENTRIES  (1 << (L2_P2M_SHIFT - L1_P2M_SHIFT))    
 #define L3_P2M_ENTRIES  (1 << (L3_P2M_SHIFT - L2_P2M_SHIFT))